More texture upload fixes

In some cases, with bpp == 3 and a rowstride
that is divisible by 4, we were passing invalid
parameters to GL.

Fixes: #3198

diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
index 7f544dc00395e091a9a7fca4db9f1f15d246454f..d4359844a30fab2a4335922e81aafddf7dfd3a39 100644 (file)
--- a/gdk/gdkglcontext.c
+++ b/gdk/gdkglcontext.c
@@ -299,13 +299,11 @@ gdk_gl_context_upload_texture (GdkGLContext    *context,
   else if ((!priv->use_es ||
             (priv->use_es && (priv->gl_version >= 30 || priv->has_unpack_subimage))))
     {
-      glPixelStorei (GL_UNPACK_ALIGNMENT, bpp);
       glPixelStorei (GL_UNPACK_ROW_LENGTH, stride / bpp);
 
       glTexImage2D (texture_target, 0, GL_RGBA, width, height, 0, gl_format, gl_type, data);
 
       glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
-      glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
     }
   else
     {